Infer regions for opaque types in borrowck #67681

matthewjasper · 2019-12-28T16:55:31Z

This is a step towards the goal of typeck not doing region inference.

The commits up to Arena allocate the result of mir_borrowck are various bug fixes and prerequisites.
The remaining commits move opaque type inference to borrow checking.

r? @nikomatsakis

src/librustc_typeck/impl_wf_check.rs

src/librustc_mir/transform/check_unsafety.rs

src/librustc/hir/lowering.rs

src/librustc/infer/opaque_types/mod.rs

src/librustc_mir/build/mod.rs

src/librustc_mir/borrow_check/type_check/mod.rs

src/librustc/infer/opaque_types/mod.rs

src/librustc_typeck/collect.rs

matthewjasper · 2019-12-29T16:28:45Z

@bors try @rust-timer queue

rust-timer · 2019-12-29T16:28:46Z

Awaiting bors try build completion

bors · 2019-12-29T16:28:55Z

⌛ Trying commit e23a0cb45307a173427b9fcaefe648530e5f27c6 with merge 109224fdba977e11e6046e91fe34f9430fd0203a...

bors · 2019-12-29T19:28:39Z

☀️ Try build successful - checks-azure
Build commit: 109224fdba977e11e6046e91fe34f9430fd0203a (109224fdba977e11e6046e91fe34f9430fd0203a)

rust-timer · 2019-12-29T19:28:41Z

Queued 109224fdba977e11e6046e91fe34f9430fd0203a with parent e0239b4, future comparison URL.

rust-timer · 2019-12-29T21:23:51Z

Finished benchmarking try commit 109224fdba977e11e6046e91fe34f9430fd0203a, comparison URL.

matthewjasper · 2019-12-29T21:59:07Z

Perf is slightly green. That wasn't exactly expected, I'll investigate tomorrow.
edit: at least some of it's due to making fewer is_freeze queries.

Zoxc · 2020-01-02T00:34:43Z

src/librustc/query/mod.rs

            desc { |tcx| "borrow-checking `{}`", tcx.def_path_str(key) }
-            cache_on_disk_if(tcx, _) { key.is_local() && tcx.is_closure(key) }
+            cache_on_disk_if { key.is_local() }


Why are you caching non-closure keys?

Because it's no longer just closures that can have interesting borrow checking results. I didn't realize that this could depend on the query's result though, I can change it to that if that wouldn't cause problems.

I think you can look at the values, yes. What's looking at non-closure borrow checking results now?

type_of for opaque types is looking at it.

src/librustc/arena.rs

src/librustc_mir/borrow_check/region_infer/opaque_types.rs

matthewjasper · 2020-01-05T18:34:49Z

src/librustc_mir/borrow_check/nll.rs

+    };
+
+    if !opaque_type_values.is_empty() {
+        err.note(&format!("Inferred opaque type values:\n{:#?}", opaque_type_values));


I'm not sure if we want to have tests which use this.

bors · 2020-01-06T16:07:23Z

☔ The latest upstream changes (presumably #67886) made this pull request unmergeable. Please resolve the merge conflicts.

nikomatsakis

OK, I did a first pass. Everything looks like it makes sense but I left two comments for what seem to be the most "load-bearing" parts of the PR that I want to re-read. Thanks for pushing on this, @matthewjasper!

nikomatsakis · 2020-01-06T22:27:15Z

src/librustc_mir/borrow_check/region_infer/opaque_types.rs

+                // Map back to "concrete" regions so that errors in
+                // `infer_opaque_definition_from_instantiation` can show
+                // sensible region names.
+                let universal_concrete_type =


I'm not sure what's going on here.

I've added a hopefully helpful comment to this function.

nikomatsakis · 2020-01-06T22:32:05Z

src/librustc_mir/borrow_check/type_check/mod.rs

+                            Some(opaque_defn_ty) => opaque_defn_ty,
+                        };
+                        debug!("opaque_defn_ty = {:?}", opaque_defn_ty);
+                        let subst_opaque_defn_ty =


I should read this again.

rust-highfive · 2020-01-11T23:08:52Z

The job x86_64-gnu-llvm-7 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

2020-01-11T22:23:04.9229154Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-01-11T22:23:04.9241348Z ##[command]git config gc.auto 0
2020-01-11T22:23:04.9243900Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-01-11T22:23:04.9246017Z ##[command]git config --get-all http.proxy
2020-01-11T22:23:04.9248670Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/67681/merge:refs/remotes/pull/67681/merge
---
2020-01-11T23:06:01.3849661Z 594 | |         })
2020-01-11T23:06:01.3849945Z 595 | |     }
2020-01-11T23:06:01.3850189Z     | |_____^
2020-01-11T23:06:01.3854401Z 
2020-01-11T23:06:01.3862386Z thread 'rustc' panicked at 'no errors encountered even though `delay_span_bug` issued', src/librustc_errors/lib.rs:346:17
2020-01-11T23:06:01.3872324Z 
2020-01-11T23:06:01.3878189Z error: internal compiler error: unexpected panic
2020-01-11T23:06:01.3882048Z 
2020-01-11T23:06:01.3931512Z note: the compiler unexpectedly panicked. this is a bug.
2020-01-11T23:06:01.3931512Z note: the compiler unexpectedly panicked. this is a bug.
2020-01-11T23:06:01.3931568Z 
2020-01-11T23:06:01.3932251Z note: we would appreciate a bug report: ***/blob/master/CONTRIBUTING.md#bug-reports
2020-01-11T23:06:01.3932316Z 
2020-01-11T23:06:01.3932637Z note: rustc 1.42.0-nightly (1bdc742a3 2020-01-11) running on x86_64-unknown-linux-gnu
2020-01-11T23:06:01.3932673Z 
2020-01-11T23:06:01.3933133Z note: compiler flags: -Z external-macro-backtrace -Z unstable-options -Z binary-dep-depinfo -Z force-unstable-if-unmarked -C opt-level=2 -C debuginfo=0 -C link-args=-Wl,-rpath,$ORIGIN/../lib -C prefer-dynamic -C llvm-args=-import-instr-limit=10 -C debug-assertions=n --crate-type lib
2020-01-11T23:06:01.3933262Z note: some of the compiler flags provided by cargo are hidden
2020-01-11T23:06:01.3933295Z 
2020-01-11T23:06:01.4467995Z error: could not compile `rustc`.
2020-01-11T23:06:01.4471299Z warning: build failed, waiting for other jobs to finish...
---
2020-01-11T23:08:46.0325432Z   local time: Sat Jan 11 23:08:46 UTC 2020
2020-01-11T23:08:46.3268921Z   network time: Sat, 11 Jan 2020 23:08:46 GMT
2020-01-11T23:08:46.3270528Z == end clock drift check ==
2020-01-11T23:08:47.2925811Z 
2020-01-11T23:08:47.3042653Z ##[error]Bash exited with code '1'.
2020-01-11T23:08:47.3080049Z ##[section]Starting: Checkout
2020-01-11T23:08:47.3081984Z ==============================================================================
2020-01-11T23:08:47.3082047Z Task         : Get sources
2020-01-11T23:08:47.3082117Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

bors · 2020-01-12T13:03:38Z

☔ The latest upstream changes (presumably #67901) made this pull request unmergeable. Please resolve the merge conflicts.

matthewjasper · 2020-01-12T19:48:28Z

I've made some more changes that may affect performance
@bors try @rust-timer queue

* Use better span for member constraint errors * Avoid a bad suggestion * Don't report member constraint errors if we have other universal region errors.

Also correctly calculate what the upper bounds are.

This ensures that NLL will infer suitable values for regions in opaque types when it's possible.

matthewjasper · 2020-02-14T22:40:57Z

@bors r=nikomatsakis

bors · 2020-02-14T22:40:59Z

📌 Commit d863978 has been approved by nikomatsakis

bors · 2020-02-15T02:24:09Z

⌛ Testing commit d863978 with merge 19288dd...

@nikomatsakis

…omatsakis Infer regions for opaque types in borrowck This is a step towards the goal of typeck not doing region inference. The commits up to `Arena allocate the result of mir_borrowck` are various bug fixes and prerequisites. The remaining commits move opaque type inference to borrow checking. r? @nikomatsakis

bors · 2020-02-15T05:57:32Z

☀️ Test successful - checks-azure
Approved by: nikomatsakis
Pushing 19288dd to master...

zg2t2cwz4d · 2023-07-22T07:57:17Z

👌🏼

rust-highfive assigned nikomatsakis Dec 28, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 28, 2019

matthewjasper force-pushed the infer-regions-in-borrowck branch from c3363af to 784008b Compare December 28, 2019 16:57

This comment has been minimized.

Sign in to view

matthewjasper force-pushed the infer-regions-in-borrowck branch from 784008b to 2624f6f Compare December 28, 2019 18:41

Centril added the F-type_alias_impl_trait `#[feature(type_alias_impl_trait)]` label Dec 28, 2019

Centril reviewed Dec 28, 2019

View reviewed changes

Centril added F-impl_trait_in_bindings `#![feature(impl_trait_in_bindings)]` F-member_constraints `#[feature(member_constraints)]` labels Dec 28, 2019

matthewjasper force-pushed the infer-regions-in-borrowck branch from 2624f6f to e23a0cb Compare December 29, 2019 14:23

Zoxc reviewed Jan 2, 2020

View reviewed changes

src/librustc/arena.rs Outdated Show resolved Hide resolved

matthewjasper force-pushed the infer-regions-in-borrowck branch from e23a0cb to 41b92f3 Compare January 5, 2020 18:31

matthewjasper commented Jan 5, 2020

View reviewed changes

nikomatsakis approved these changes Jan 6, 2020

View reviewed changes

matthewjasper force-pushed the infer-regions-in-borrowck branch 2 times, most recently from b840ce6 to ed6cb3f Compare January 11, 2020 22:22

matthewjasper force-pushed the infer-regions-in-borrowck branch from 3069435 to f2cebdc Compare January 12, 2020 16:23

matthewjasper added 8 commits February 14, 2020 22:40

Improve opaque type lifetime errors

2bd16f3

* Use better span for member constraint errors * Avoid a bad suggestion * Don't report member constraint errors if we have other universal region errors.

Always check upper bounds when choosing member regions

dd1687e

Also correctly calculate what the upper bounds are.

Use member constraint for most opaque types in NLL

e3e5d27

This ensures that NLL will infer suitable values for regions in opaque types when it's possible.

Update tests

78e0ab5

Fix and test nested impl Trait

6d9e270

Add fast path to eq_opaque_type_and_type

223a2ee

Split type_of out of collect.rs

edddb62

Fix tests after rebase

d863978

matthewjasper force-pushed the infer-regions-in-borrowck branch from 93e6ed7 to d863978 Compare February 14, 2020 22:40

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 14, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 15, 2020

bors merged commit d863978 into rust-lang:master Feb 15, 2020

matthewjasper deleted the infer-regions-in-borrowck branch February 15, 2020 06:07

This was referenced Feb 15, 2020

Select an appropriate unused lifetime name in suggestion #69159

Merged

Propagate lifetime resolution errors into tcx.type_of #69178

Closed

Rename FunctionRetTy to FnRetTy #69179

Merged

This was referenced Feb 16, 2020

Broken MIR impl_trait_in_bindings ICE #57201

Closed

NLL impl_trait_in_bindings ICE #57200

Closed

ICE impl_trait_in_bindings with elided lifetime #60473

Closed

quad-ICE with impl Trait in binding #67166

Closed

tmandry mentioned this pull request Jul 7, 2020

Inconsistent borrow check in async function #74068

Open

JohnTitor mentioned this pull request Oct 25, 2020

ICE:assertion failed: body.yield_ty.is_some() && universal_regions.yield_ty.is_some() || body.yield_ty.is_none() && universal_regions.yield_ty.is_none() #78336

Closed

matthiaskrgr mentioned this pull request Jul 5, 2023

ice: continue to unknown label async fn / assertion failed: ln.index() < self.live_nodes #113379

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Infer regions for opaque types in borrowck #67681

Infer regions for opaque types in borrowck #67681

matthewjasper commented Dec 28, 2019

This comment has been minimized.

matthewjasper commented Dec 29, 2019

rust-timer commented Dec 29, 2019

bors commented Dec 29, 2019

bors commented Dec 29, 2019

rust-timer commented Dec 29, 2019

rust-timer commented Dec 29, 2019

matthewjasper commented Dec 29, 2019 •

edited

Loading

Zoxc Jan 2, 2020

matthewjasper Jan 3, 2020

Zoxc Jan 4, 2020

matthewjasper Jan 4, 2020

matthewjasper Jan 5, 2020

bors commented Jan 6, 2020

nikomatsakis left a comment

nikomatsakis Jan 6, 2020

matthewjasper Jan 11, 2020

nikomatsakis Jan 6, 2020

rust-highfive commented Jan 11, 2020

bors commented Jan 12, 2020

matthewjasper commented Jan 12, 2020

matthewjasper commented Feb 14, 2020

bors commented Feb 14, 2020

bors commented Feb 15, 2020

bors commented Feb 15, 2020

zg2t2cwz4d commented Jul 22, 2023

Infer regions for opaque types in borrowck #67681

Infer regions for opaque types in borrowck #67681

Conversation

matthewjasper commented Dec 28, 2019

This comment has been minimized.

matthewjasper commented Dec 29, 2019

rust-timer commented Dec 29, 2019

bors commented Dec 29, 2019

bors commented Dec 29, 2019

rust-timer commented Dec 29, 2019

rust-timer commented Dec 29, 2019

matthewjasper commented Dec 29, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bors commented Jan 6, 2020

nikomatsakis left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rust-highfive commented Jan 11, 2020

bors commented Jan 12, 2020

matthewjasper commented Jan 12, 2020

matthewjasper commented Feb 14, 2020

bors commented Feb 14, 2020

bors commented Feb 15, 2020

bors commented Feb 15, 2020

zg2t2cwz4d commented Jul 22, 2023

matthewjasper commented Dec 29, 2019 •

edited

Loading